MLE-28100 MLE-29561: fix ResourceSequence leak in ContentOutputFormat initialize() and null pointer dereference in NodeImpl.isEqualNode()#605
Conversation
….initialize() and null pointer dereference in NodeImpl.isEqualNode()
There was a problem hiding this comment.
Pull request overview
Fixes two correctness issues in mlcp’s Java code: (1) properly closing XCC ResultSequence created during ContentOutputFormat.initialize() to avoid leaking server-side resources, and (2) correcting guard logic and comparisons in NodeImpl.isEqualNode() to prevent NPEs and incorrect equality results.
Changes:
- Wrap
session.submitRequest(query)/ result parsing inContentOutputFormat.initialize()withtry/finallyto always closeResultSequence. - Fix
NodeImpl.isEqualNode()to use the correcthasAttributes()/hasChildNodes()guards and negate mismatch comparisons.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| src/main/java/com/marklogic/mapreduce/ContentOutputFormat.java | Adds try/finally to close ResultSequence and refactors initialization result parsing. |
| src/main/java/com/marklogic/dom/NodeImpl.java | Fixes equality logic to avoid NPE and correct boolean comparison semantics. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
I just added a try/finally around the result handling and indented the inner code accordingly. whitespace-ignored diff: https://github.com/marklogic/marklogic-contentpump/pull/605/changes?w=1 |
vshaniga
deleted the
MLE-28100-MLE-29561-fix-mlcp-resource-leak-and-null-ptr
branch
MLE-28100 — Fix
ResultSequenceleak inContentOutputFormat.initialize()Problem:
initialize()calledsession.submitRequest(query)and stored the result in aResultSequence, but never closed it. On repeated initializations or exception paths, this leaked server-side connections and sockets.Fix:
submitRequestcall and result-reading logic in a try/finally block that callsresult.close().File: src/main/java/com/marklogic/mapreduce/ContentOutputFormat.java
MLE-29561 — Fix NULL pointer dereference and logic bugs in
NodeImpl.isEqualNode()Problem:
Three logic bugs in
isEqualNode():hasChildNodes()guard was used to enter the attributes comparison block —getAttributes()could return null if the node has no attributes, causing a NPE.hasAttributes()guard was used to enter the child nodes comparison block — incorrect semantics.isEqualNode()comparisons were missing negation — the method returned false when nodes were equal instead of when they were not equal.Fix:
hasAttributes() / hasChildNodes()guards to match their respective blocks.isEqualNode()comparisons.File: src/main/java/com/marklogic/dom/NodeImpl.java
Tests